Merge pull request #66 from kaltura/MOODLE_28_STABLE_merge_with_DEV

Moodle 28 stable merge with dev
kaltura · Nov 24, 2015 · 2e4bce7 · 2e4bce7
2 parents 1cdf35c + 5712f6f
commit 2e4bce7
Show file tree

Hide file tree

Showing 24 changed files with 468 additions and 393 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,20 @@
-/nbproject
+# ignore all files
+*
+
+# except our plugins':
+
+!mod/kalvidassign/*
+!mod/kalvidpres/*
+!mod/kalvidres/*
+
+!filter/kaltura/*
+
+!local/kaltura/*
+!local/kalturamediagallery/*
+!local/mymedia/*
+
+!lib/editor/atto/plugins/kalturamedia/*
+!lib/editor/tinymce/plugins/kalturamedia/*
+
+!createPackage.sh
+!incrementVersion.sh
diff --git a/filter/kaltura/version.php b/filter/kaltura/version.php
@@ -24,10 +24,10 @@
  */
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2015090708;
-$plugin->release = 'Kaltura release 4.0.07';
+$plugin->version = 2015101808;
+$plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires = 2014050800;
 $plugin->maturity = MATURITY_STABLE;
 $plugin->dependencies = array(
-    'local_kaltura' => 2015090708
+    'local_kaltura' => 2015101808
 );
diff --git a/lib/editor/atto/plugins/kalturamedia/lib.php b/lib/editor/atto/plugins/kalturamedia/lib.php
@@ -45,5 +45,6 @@ function atto_kalturamedia_params_for_js($elementid, $options, $fpoptions) {
     return array(
         'kalturauritoken' => KALTURA_URI_TOKEN,
         'contextid' => $context->id,
+        'kafuri' => local_kaltura_get_config()->kaf_uri
         );
 }
diff --git a/lib/editor/atto/plugins/kalturamedia/version.php b/lib/editor/atto/plugins/kalturamedia/version.php
@@ -24,10 +24,10 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version   = 2015090708;        // The current plugin version (Date: YYYYMMDDXX).
-$plugin->release = 'Kaltura release 4.0.07';
+$plugin->version   = 2015101808;        // The current plugin version (Date: YYYYMMDDXX).
+$plugin->release = 'Kaltura release 4.0.08';
 $plugin->requires  = 2014050800;        // Requires this Moodle version.
 $plugin->component = 'atto_kalturamedia';  // Full name of the plugin (used for diagnostics).
 $plugin->dependencies = array(
-    'local_kaltura' => 2015090708
+    'local_kaltura' => 2015101808
 );
diff --git a/...amedia/yui/build/moodle-atto_kalturamedia-button/moodle-atto_kalturamedia-button-debug.js b/...amedia/yui/build/moodle-atto_kalturamedia-button/moodle-atto_kalturamedia-button-debug.js
@@ -120,7 +120,17 @@ Y.namespace('M.atto_kalturamedia').Button = Y.Base.create('button', Y.M.editor_a
 
         return courseId;
     },
-
+
+    _replaceKafUriWithToken: function(sourceUrl, kafUri, kalturaToken) {
+        sourceUrl = this._removeProtocolFromUrl(sourceUrl);
+        kafUri = this._removeProtocolFromUrl(kafUri);
+        return sourceUrl.replace(kafUri, kalturaToken);
+    },
+
+    _removeProtocolFromUrl: function(fullUrl) {
+        return fullUrl.replace(/^https?:\/\//,'');
+    },
+
     embedItem: function(what) {
         var dialogue = this.getDialogue({
             focusAfterHide: null
@@ -137,17 +147,13 @@ Y.namespace('M.atto_kalturamedia').Button = Y.Base.create('button', Y.M.editor_a
             }
         }
 
-        var token = this.get('kalturauritoken'); 
-        var url = '';
+        var token = this.get('kalturauritoken');
+        var kafUri = this.get('kafuri');
+        var sourceUrl = embedInfo.url;
+        var url = this._replaceKafUriWithToken(sourceUrl, kafUri, token);
         var parser = document.createElement('a');
-        parser.href = embedInfo.url;
-        var basePathName = parser.pathname;
-        // IE fix because parser.pathname does not return with trailing slash
-        if(basePathName.indexOf('/') != 0)
-        {
-            basePathName = '/' + basePathName;
-        }
-        url = token + basePathName + parser.search;
+        parser.href = sourceUrl;
+        url += parser.search;
 
         var content = '<a href="http://'+url+'">tinymce-kalturamedia-embed||'+embedInfo.title+'||'+embedInfo.width+'||'+embedInfo.height+'</a>';
 
@@ -156,7 +162,6 @@ Y.namespace('M.atto_kalturamedia').Button = Y.Base.create('button', Y.M.editor_a
         host.insertContentAtFocusPoint(content);
         this.markUpdated();
         dialogue.set('bodyContent', "").hide();
-
     }
 
 } , {
@@ -176,6 +181,13 @@ Y.namespace('M.atto_kalturamedia').Button = Y.Base.create('button', Y.M.editor_a
         */
         kalturauritoken: {
             value: null
+        },
+
+        /**
+         * The KAF URI, as configured in Kaltura's plugin settings.
+         */
+        kafuri: {
+            value: null
         }
     }}
 );