Răsfoiți Sursa

Revert "Small change to remove need for jquery-private-external.js updates #269"

This reverts commit d33faa53d0c23344db6b3ab1118846cae6b75632.

Conflicts:
	src/build-no-jquery.js
JC Brand 10 ani în urmă
părinte
comite
7bdb7ae5aa
3 a modificat fișierele cu 4 adăugiri și 2 ștergeri
  1. 0 1
      docs/CHANGES.rst
  2. 1 1
      src/build-no-jquery.js
  3. 3 0
      src/jquery-private-external.js

+ 0 - 1
docs/CHANGES.rst

@@ -18,7 +18,6 @@ Changelog
 * #251 Non-minified builds for debugging. [jcbrand]
 * #251 Non-minified builds for debugging. [jcbrand]
 * #264 Remove unnecessary commas for ie8 compatibility. [Deuteu]
 * #264 Remove unnecessary commas for ie8 compatibility. [Deuteu]
 * #267 Unread messages counter wrongly gets incremented by chat state notifications. [Deuteu]
 * #267 Unread messages counter wrongly gets incremented by chat state notifications. [Deuteu]
-* #269 Add new build that does not include jQuery. [gbonvehi]
 
 
 0.8.3 (2014-09-22)
 0.8.3 (2014-09-22)
 ------------------
 ------------------

+ 1 - 1
src/build-no-jquery.js

@@ -7,6 +7,6 @@
     paths: {
     paths: {
         "converse-dependencies":    "src/deps-full",
         "converse-dependencies":    "src/deps-full",
         "jquery":                   "src/jquery-external",
         "jquery":                   "src/jquery-external",
-        "jquery-private":           "src/jquery-external-private"
+        "jquery-private":           "src/jquery-private-external",
     }
     }
 })
 })

+ 3 - 0
src/jquery-private-external.js

@@ -0,0 +1,3 @@
+define(['jquery'], function (jq) {
+    return jq;
+});